Merge version 5.11.3+dfsg-2+rpi1 and 5.11.3+dfsg-5 to produce 5.11.3+dfsg-5+rpi1

diff --cc debian/changelog
index c3d1e357f354dd3004e71cf8c87fe9b622f2649b,7128e339849bd0ef5e061909b956694eea560f32..4f19b81ea8f23fe1389c27e05ef2e5899266cec5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,55 +1,65 @@@
- qtbase-opensource-src (5.11.3+dfsg-2+rpi1) buster-staging; urgency=medium
++qtbase-opensource-src (5.11.3+dfsg-5+rpi1) buster-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Jan 2019 00:12:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Feb 2019 23:38:25 +0000
++
+ qtbase-opensource-src (5.11.3+dfsg-5) unstable; urgency=medium
+ 
+   * Revert part of the mkspecs movements between packages. The private ones
+     where put into qtbase5-private-dev, but it seems that they are not ready
+     for that (Closes: #921930).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Sun, 10 Feb 2019 11:47:21 -0300
+ 
+ qtbase-opensource-src (5.11.3+dfsg-4) unstable; urgency=medium
+ 
+   * Revert the GLES-related symbols changes from the previous upload.
+     These changes were only for experimental and not yet for unstable.
+   * Upload to unstable.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Backport mysql_free_results_when_qsqlquery_finished_is_called.patch,
+     required by akonadi (closes: #921584).
+ 
+   [ Dmitry Shachnev ]
+   * Fix installed files list on hurd and kfreebsd (closes: #920236).
+     Thanks to Samuel Thibault!
+   * Move qt_lib_opengl.pri from qtbase5-dev to libqt5opengl5-dev.
+   * Backport upstream commit to fix duplex printing (LP: #1776173).
+     Thanks to Robert Bredereck for the initial patch!
+   * Add missing features.h include to hurd-g++ mkspec (closes: #920613).
+     Thanks to Samuel Thibault for the patch!
+   * Update symbols files from ia64 build logs.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Fri, 08 Feb 2019 17:11:47 +0300
+ 
+ qtbase-opensource-src (5.11.3+dfsg-3) experimental; urgency=medium
+ 
+   [ Kai Pastor ]
+   * debian/scripts/update-copyright:
+     - Update licenses_map for Qt 5.12.
+     - Don’t output filenames unless --verbose flag is given.
+     - Add license information to printed filenames.
+     - Rewrite canonicalize_author_name(), add more author rules.
+     - Factor out read_input().
+ 
+   [ Dmitry Shachnev ]
+   * debian/scripts/update-copyright:
+     - Use regular expressions for parsing license and copyright lines.
+   * Regenerate debian/copyright.
+   * Update libqt5gui5.symbols to add an alternative dependency on
+     libqt5gui5-gles for symbols that are present in both libraries.
+   * Expand debian/qt5-qmake.install to allow us to split that package,
+     and to track upstream file additions and deletions.
+   * Move /usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_*.pri
+     files from qt5-qmake to qtbase5-dev and qtbase5-private-dev.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 09 Jan 2019 12:13:49 +0300
  
  qtbase-opensource-src (5.11.3+dfsg-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index f4e2533a75ded96b19f14d10f4c3970bf5ba1cd7,6319467733b07e3b274f853eb939ef5b00bb1603..9892055720f05b22ca4749ef4f96b260b75494fe
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -16,4 -18,4 +18,5 @@@ qdoc_default_incdirs.dif
  kfreebsd_qstrncpy.diff
  alpha_atimensec.diff
  revert_remove_our_use_of_syscall_for-statx.patch
+ hurd_missing_include.diff
 +modify-configure.json-to-disable-neon.patch